bitkeeper revision 1.1128 (410f8501U6k1p4VW0CM4HcZS8VUAwQ)

Merge freefall.cl.cam.ac.uk:/auto/groups/xeno/BK/xeno.bk
into freefall.cl.cam.ac.uk:/auto/groups/xeno/users/cl349/BK/xeno.bk-ptrw

diff --cc xen/arch/x86/memory.c
Simple merge

diff --cc xen/arch/x86/traps.c
Simple merge

diff --cc xen/common/schedule.c
Simple merge

diff --cc xen/include/asm-x86/mm.h
Simple merge

diff --cc xen/include/xen/sched.h
Simple merge